Skip to content

tools,build: allow build without remark-cli #16893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Nov 10, 2017
Merged

tools,build: allow build without remark-cli #16893

merged 1 commit into from
Nov 10, 2017

Conversation

@refack
Copy link
Contributor

@refack refack commented Nov 8, 2017

Refs: #16635 (comment)
The lint target in the Makefile is dependant on remark-cli being installed in /tools/ or alternatively on internet access to the npm registry. The source tarball does not include remark-cli nor ESLint, so this PR uses the same conditional pattern as for lint-js:

node/Makefile

Lines 1082 to 1107 in d597317

ifneq ("","$(wildcard tools/eslint/)")
lint:
@EXIT_STATUS=0 ; \
$(MAKE) lint-js || EXIT_STATUS=$$? ; \
$(MAKE) lint-cpp || EXIT_STATUS=$$? ; \
$(MAKE) lint-md || EXIT_STATUS=$$? ; \
$(MAKE) lint-addon-docs || EXIT_STATUS=$$? ; \
exit $$EXIT_STATUS
CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
lint-ci: lint-js-ci lint-cpp lint-md lint-addon-docs
@if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \
&& ! ( find . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \
exit 0 ; \
else \
echo "" >&2 ; \
echo "Conflict marker detected in one or more files. Please fix them first." >&2 ; \
exit 1 ; \
fi
else
lint:
@echo "Linting is not available through the source tarball."
@echo "Use the git repo instead:" \
"$ git clone https://github.com/nodejs/node.git"
lint-ci: lint
endif

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

build,tools

@refack refack requested review from joyeecheung and watilde November 8, 2017 23:39
@nodejs-github-bot nodejs-github-bot added the build Issues and PRs related to build files or the CI. label Nov 8, 2017
@refack refack force-pushed the mdlint-on-tarball branch from a2dc284 to 5600fb7 Compare November 8, 2017 23:46
@refack refack added the tools Issues and PRs related to the tools directory. label Nov 8, 2017
@refack refack mentioned this pull request Nov 8, 2017
Closed
2 tasks
@refack
Copy link
Contributor Author

refack commented Nov 8, 2017 •
edited
Loading

CI: https://ci.nodejs.org/job/node-test-pull-request/11317/

@refack refack force-pushed the mdlint-on-tarball branch from 5600fb7 to f889a14 Compare November 9, 2017 00:04
@refack refack merged commit e624503 into nodejs:master Nov 10, 2017
@refack refack deleted the mdlint-on-tarball branch November 10, 2017 22:13
evanlucas pushed a commit that referenced this pull request Nov 13, 2017
@refack @evanlucas
tools,build: allow build without remark-cli
942a9ed 
PR-URL: #16893
Reviewed-By: Joyee Cheung <[email protected]>
@evanlucas evanlucas mentioned this pull request Nov 13, 2017
Merged
MylesBorins pushed a commit that referenced this pull request Nov 17, 2017
@refack @MylesBorins
tools,build: allow build without remark-cli
0d4f62c 
PR-URL: #16893
Reviewed-By: Joyee Cheung <[email protected]>
@MylesBorins
Copy link
Contributor

This should be included in a general backport of remark for v6.x

@gibfahn gibfahn mentioned this pull request Nov 21, 2017
Merged
@MylesBorins MylesBorins added the baking-for-lts PRs that need to wait before landing in a LTS release. label Dec 20, 2017
@joyeecheung joyeecheung mentioned this pull request Feb 1, 2018
Closed
1 task
@MylesBorins MylesBorins removed the baking-for-lts PRs that need to wait before landing in a LTS release. label Aug 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joyeecheung joyeecheung joyeecheung approved these changes

@watilde watilde Awaiting requested review from watilde

Assignees

No one assigned

Labels

build Issues and PRs related to build files or the CI. tools Issues and PRs related to the tools directory.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@refack @MylesBorins @joyeecheung @nodejs-github-bot